Merge tag 'upstream/2017.3' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 10 Mar 2017 23:16:42 +0000 (23:16 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 10 Mar 2017 23:16:42 +0000 (23:16 +0000)
commitdf8af664bd8dbd8174234cacc692037e22b5edda
treec50c0713627404c41436d3ece8850f955724670f
parentbb063fb17859c423d9499889805afcde7c1bb5dd
parent057de00126c65671994fafce2849bff91a06ffce
Merge tag 'upstream/2017.3' into debian/master

Upstream version 2017.3